Merge from mainline.

author Paul Eggert <eggert@cs.ucla.edu>

Fri, 18 Feb 2011 07:44:39 +0000 (23:44 -0800)

committer Paul Eggert <eggert@cs.ucla.edu>

Fri, 18 Feb 2011 07:44:39 +0000 (23:44 -0800)
author Paul Eggert <eggert@cs.ucla.edu>
Fri, 18 Feb 2011 07:44:39 +0000 (23:44 -0800)
committer Paul Eggert <eggert@cs.ucla.edu>
Fri, 18 Feb 2011 07:44:39 +0000 (23:44 -0800)
diff --cc ChangeLog
Simple merge
diff --cc src/ChangeLog
Simple merge
author	Paul Eggert <eggert@cs.ucla.edu>
	Fri, 18 Feb 2011 07:44:39 +0000 (23:44 -0800)
committer	Paul Eggert <eggert@cs.ucla.edu>
	Fri, 18 Feb 2011 07:44:39 +0000 (23:44 -0800)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history